From 6b11e5cf5199e702b8eddde88338b66b09f19a70 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 22 Feb 2002 00:26:54 +0000 Subject: [PATCH] s/columns/rows/ in docs. (#70199) * gtk/gtktreeview.c (gtk_tree_view_set_reorderable): s/columns/rows/ in docs. (#70199) * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in docs. (#71852, #68405) * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment. * gtk/tmpl/gtksignal.sgml, gtk/tmpl/gtkimage.sgml: s/%d/%%d/ in examples. (#71479) * gtk/tmpl/gtkmenu.sgml: Document gtk_menu_set_active as quasi-private. (#69788) * gtk/tmpl/gtkcalendar.sgml: Document month as zero-based and selected_day as one-based. (#57169) --- ChangeLog | 10 ++++++++ ChangeLog.pre-2-0 | 10 ++++++++ ChangeLog.pre-2-10 | 10 ++++++++ ChangeLog.pre-2-2 | 10 ++++++++ ChangeLog.pre-2-4 | 10 ++++++++ ChangeLog.pre-2-6 | 10 ++++++++ ChangeLog.pre-2-8 | 10 ++++++++ docs/reference/ChangeLog | 11 +++++++++ docs/reference/gtk/tmpl/gtkcalendar.sgml | 16 +++++++++---- docs/reference/gtk/tmpl/gtkimage.sgml | 2 +- docs/reference/gtk/tmpl/gtkmenu.sgml | 2 +- docs/reference/gtk/tmpl/gtksignal.sgml | 2 +- gtk/gtkcalendar.c | 2 +- gtk/gtktreestore.c | 2 +- gtk/gtktreeview.c | 29 +----------------------- 15 files changed, 99 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f0f3c0935..0cfd5a1289 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-02-22 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_reorderable): + s/columns/rows/ in docs. (#70199) + + * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in + docs. (#71852, #68405) + + * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment. + Thu Feb 21 23:02:29 2002 Kristian Rietveld * gtk/gtktreeview.[ch]: add keynav handling for unselect all, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2f0f3c0935..0cfd5a1289 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +2002-02-22 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_reorderable): + s/columns/rows/ in docs. (#70199) + + * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in + docs. (#71852, #68405) + + * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment. + Thu Feb 21 23:02:29 2002 Kristian Rietveld * gtk/gtktreeview.[ch]: add keynav handling for unselect all, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2f0f3c0935..0cfd5a1289 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2002-02-22 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_reorderable): + s/columns/rows/ in docs. (#70199) + + * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in + docs. (#71852, #68405) + + * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment. + Thu Feb 21 23:02:29 2002 Kristian Rietveld * gtk/gtktreeview.[ch]: add keynav handling for unselect all, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2f0f3c0935..0cfd5a1289 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +2002-02-22 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_reorderable): + s/columns/rows/ in docs. (#70199) + + * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in + docs. (#71852, #68405) + + * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment. + Thu Feb 21 23:02:29 2002 Kristian Rietveld * gtk/gtktreeview.[ch]: add keynav handling for unselect all, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2f0f3c0935..0cfd5a1289 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +2002-02-22 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_reorderable): + s/columns/rows/ in docs. (#70199) + + * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in + docs. (#71852, #68405) + + * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment. + Thu Feb 21 23:02:29 2002 Kristian Rietveld * gtk/gtktreeview.[ch]: add keynav handling for unselect all, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2f0f3c0935..0cfd5a1289 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +2002-02-22 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_reorderable): + s/columns/rows/ in docs. (#70199) + + * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in + docs. (#71852, #68405) + + * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment. + Thu Feb 21 23:02:29 2002 Kristian Rietveld * gtk/gtktreeview.[ch]: add keynav handling for unselect all, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2f0f3c0935..0cfd5a1289 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2002-02-22 Matthias Clasen + + * gtk/gtktreeview.c (gtk_tree_view_set_reorderable): + s/columns/rows/ in docs. (#70199) + + * gtk/gtktreestore.c (gtk_tree_store_insert): s/before/after/ in + docs. (#71852, #68405) + + * gtk/gtkcalendar.c (gtk_calendar_select_day): Correct a comment. + Thu Feb 21 23:02:29 2002 Kristian Rietveld * gtk/gtktreeview.[ch]: add keynav handling for unselect all, diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 165481dbcb..b53f247ed7 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,14 @@ +2002-02-22 Matthias Clasen + + * gtk/tmpl/gtksignal.sgml, gtk/tmpl/gtkimage.sgml: s/%d/%%d/ in + examples. (#71479) + + * gtk/tmpl/gtkmenu.sgml: Document gtk_menu_set_active as + quasi-private. (#69788) + + * gtk/tmpl/gtkcalendar.sgml: Document month as zero-based and + selected_day as one-based. (#57169) + Thu Feb 21 12:11:42 2002 Owen Taylor * gtk/Makefile.am (IGNORE_HFILES): Add gtkkeyhash.h diff --git a/docs/reference/gtk/tmpl/gtkcalendar.sgml b/docs/reference/gtk/tmpl/gtkcalendar.sgml index f744dd755f..333cf03aec 100644 --- a/docs/reference/gtk/tmpl/gtkcalendar.sgml +++ b/docs/reference/gtk/tmpl/gtkcalendar.sgml @@ -56,6 +56,13 @@ year, and selected day respectively. All of these fields should be considered read only, and everything in this struct should only be modified using the functions provided below. + + +Note that month is zero-based (i.e it allowed values +are 0-11) while selected_day is one-based +(i.e. allowed values are 1-31). + + @@ -109,7 +116,7 @@ Shifts the calendar to a different month. @calendar: a #GtkCalendar. -@month: a month number. +@month: a month number between 0 and 11. @year: the year the month is in. @Returns: %TRUE. @@ -120,7 +127,8 @@ Selects a day from the current month. @calendar: a #GtkCalendar. -@day: the day number to select. +@day: the day number between 1 and 31, or 0 to unselect + the currently selected day. @@ -129,7 +137,7 @@ Places a visual marker on a particular day. @calendar: a #GtkCalendar. -@day: the day number to mark. +@day: the day number to mark between 1 and 31. @Returns: %TRUE. @@ -139,7 +147,7 @@ Removes the visual marker from a particular day. @calendar: a #GtkCalendar. -@day: the day number to unmark. +@day: the day number to unmark between 1 and 31. @Returns: %TRUE. diff --git a/docs/reference/gtk/tmpl/gtkimage.sgml b/docs/reference/gtk/tmpl/gtkimage.sgml index f3ef863475..2010765af4 100644 --- a/docs/reference/gtk/tmpl/gtkimage.sgml +++ b/docs/reference/gtk/tmpl/gtkimage.sgml @@ -45,7 +45,7 @@ on the image, such as button clicks, place the image inside a GdkEventButton *event, gpointer data) { - g_print ("Event box clicked at coordinates %d,%d\n", + g_print ("Event box clicked at coordinates %%d,%%d\n", event->x, event->y); /* Returning TRUE means we handled the event, so the signal diff --git a/docs/reference/gtk/tmpl/gtkmenu.sgml b/docs/reference/gtk/tmpl/gtkmenu.sgml index c060e31b92..fd266c3f82 100644 --- a/docs/reference/gtk/tmpl/gtkmenu.sgml +++ b/docs/reference/gtk/tmpl/gtkmenu.sgml @@ -246,7 +246,7 @@ selection has not yet been made, the first menu item is selected. Selects the specified menu item within the menu. This is used by the -#GtkOptionMenu. +#GtkOptionMenu and should not be used by anyone else. @menu: a #GtkMenu. diff --git a/docs/reference/gtk/tmpl/gtksignal.sgml b/docs/reference/gtk/tmpl/gtksignal.sgml index 06c1edad2a..b5787dbe13 100644 --- a/docs/reference/gtk/tmpl/gtksignal.sgml +++ b/docs/reference/gtk/tmpl/gtksignal.sgml @@ -450,7 +450,7 @@ as parameter to your function: static void button_clicked_int (GtkButton* button, gpointer func_data) { - g_print ("button pressed: %d\n", GPOINTER_TO_INT (func_data)); + g_print ("button pressed: %%d\n", GPOINTER_TO_INT (func_data)); } /* By calling this function, you will make the g_print above diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 3d2046e4c8..d52e44a257 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -2130,7 +2130,7 @@ gtk_calendar_select_day (GtkCalendar *calendar, calendar->selected_day = day; - /* Deselect the new day */ + /* Select the new day */ if (day != 0) { if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar))) diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index c4497be735..65b37479cb 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -1090,7 +1090,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store, * made a child of @parent. Otherwise, the row will be created at the toplevel. * If @position is larger than the number of rows at that level, then the new * row will be inserted to the end of the list. @iter will be changed to point - * to this new row. The row will be empty before this function is called. To + * to this new row. The row will be empty after this function is called. To * fill in values, you need to call gtk_tree_store_set() or * gtk_tree_store_set_value(). * diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 18fddf8b7b..2db1766e60 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -166,8 +166,6 @@ static gboolean gtk_tree_view_button_release (GtkWidget *widget, GdkEventButton *event); static void gtk_tree_view_set_focus_child (GtkContainer *container, GtkWidget *child); -static gint gtk_tree_view_focus_in (GtkWidget *widget, - GdkEventFocus *event); static gint gtk_tree_view_focus_out (GtkWidget *widget, GdkEventFocus *event); static gint gtk_tree_view_focus (GtkWidget *widget, @@ -474,7 +472,6 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) widget_class->key_press_event = gtk_tree_view_key_press; widget_class->enter_notify_event = gtk_tree_view_enter_notify; widget_class->leave_notify_event = gtk_tree_view_leave_notify; - widget_class->focus_in_event = gtk_tree_view_focus_in; widget_class->focus_out_event = gtk_tree_view_focus_out; widget_class->drag_begin = gtk_tree_view_drag_begin; widget_class->drag_end = gtk_tree_view_drag_end; @@ -3524,36 +3521,12 @@ return TRUE; } -static gint -gtk_tree_view_focus_in (GtkWidget *widget, - GdkEventFocus *event) -{ - GtkTreeView *tree_view; - - g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - tree_view = GTK_TREE_VIEW (widget); - - GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS); - - gtk_widget_queue_draw (widget); - - return FALSE; -} - - static gint gtk_tree_view_focus_out (GtkWidget *widget, GdkEventFocus *event) { GtkWidget *search_dialog; - g_return_val_if_fail (GTK_IS_TREE_VIEW (widget), FALSE); - g_return_val_if_fail (event != NULL, FALSE); - - GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS); - gtk_widget_queue_draw (widget); /* destroy interactive search dialog */ @@ -8742,7 +8715,7 @@ gtk_tree_view_get_reorderable (GtkTreeView *tree_view) * This function is a convenience function to allow you to reorder models that * support the #GtkDragSourceIface and the #GtkDragDestIface. Both * #GtkTreeStore and #GtkListStore support these. If @reorderable is %TRUE, then - * the user can reorder the model by dragging and dropping columns. The + * the user can reorder the model by dragging and dropping rows. The * developer can listen to these changes by connecting to the model's * signals. * -- 2.30.2